From 493ad0cad4bfd77d33b92b3e036c67e0ae4a8389 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 3 Nov 2016 17:17:57 +0800 Subject: [PATCH] Visual Studio builds: Build GTK+ as a monolithic DLL Update the project configs to build GDK/GSK as a static lib and include them into the GTK+ DLL as a monolithic DLL, which is in line with what is done in the autotools builds, since the code changes needed for Windows builds for a monolithic build are now in place. --- build/win32/gtkpc.py | 42 ++-- build/win32/vs12/Makefile.am | 2 +- build/win32/vs12/gdk-4.vcxproj.filtersin | 3 - build/win32/vs12/gdk-4.vcxprojin | 125 ++--------- build/win32/vs12/gsk-4.vcxprojin | 54 +---- build/win32/vs12/gtk+-4.sln | 16 +- build/win32/vs12/gtk-4.vcxprojin | 212 +++++++++++++++++- build/win32/vs12/gtk4-build-defines.props | 2 +- build/win32/vs12/gtk4-builder-tool.vcxproj | 4 - ...way.props => gtk4-copy-gtk-broadway.props} | 24 +- .../vs12/gtk4-demo-application.vcxprojin | 4 - build/win32/vs12/gtk4-demo.vcxprojin | 4 - .../vs12/gtk4-encode-symbolic-svg.vcxproj | 4 +- build/win32/vs12/gtk4-icon-browser.vcxprojin | 4 - build/win32/vs12/gtk4-ignore-broadway.props | 4 +- build/win32/vs12/gtk4-install.propsin | 18 +- build/win32/vs12/gtk4-install.vcxproj | 8 - build/win32/vs12/gtk4-query-settings.vcxproj | 4 - build/win32/vs14/Makefile.am | 2 +- 19 files changed, 258 insertions(+), 278 deletions(-) rename build/win32/vs12/{gtk4-copy-gdk-broadway.props => gtk4-copy-gtk-broadway.props} (76%) diff --git a/build/win32/gtkpc.py b/build/win32/gtkpc.py index c406352dac..8d5e578aac 100644 --- a/build/win32/gtkpc.py +++ b/build/win32/gtkpc.py @@ -28,10 +28,10 @@ def main(argv): base_pc.setup(argv, gdk_parser) atk_min_ver = '2.15.1' - cairo_min_ver = '1.14.0' + cairo_min_ver = '1.15.2' gdk_pixbuf_min_ver = '2.30.0' gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi' - glib_min_ver = '2.45.8' + glib_min_ver = '2.49.4' epoxy_min_ver = '1.0' graphene_min_ver = '1.2' @@ -54,46 +54,30 @@ def main(argv): 'cairo >= ' + cairo_min_ver + ' ' + \ 'cairo-gobject >= ' + cairo_min_ver - gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \ - 'pangowin32 pangocairo' + ' ' + \ - pkg_required_packages, - '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends, - '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs, - '@GDK_EXTRA_CFLAGS@': '', - 'gdk-4': 'gdk-4.0'} - - gsk_pc_replace_items = {'@GSK_PACKAGES@': pkg_required_packages, + ' ' + \ - 'graphene-1.0 >= ' + graphene_min_ver - '@GSK_PRIVATE_PACKAGES@': 'epoxy >= ' + epoxy_min_ver, - '@GSK_EXTRA_LIBS@': '', - '@GSK_EXTRA_CFLAGS@': '', - 'gsk-4': 'gsk-4.0'} - gtk_pc_replace_items = {'@host@': gdk_args.host, '@GTK_BINARY_VERSION@': '4.0.0', + '@GDK_PACKAGES@': gio_package + ' ' + \ + 'pangowin32 pangocairo' + ' ' + \ + pkg_required_packages, + '@GSK_PACKAGES@': pkg_required_packages + ' ' + \ + 'graphene-1.0 >= ' + graphene_min_ver, '@GTK_PACKAGES@': 'atk >= ' + atk_min_ver + ' ' + \ pkg_required_packages + ' ' + \ gio_package, + '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends, + '@GSK_PRIVATE_PACKAGES@': 'epoxy >= ' + epoxy_min_ver, '@GTK_PRIVATE_PACKAGES@': 'atk', + '@GDK_EXTRA_CFLAGS@': '', + '@GSK_EXTRA_CFLAGS@': '', '@GTK_EXTRA_CFLAGS@': '', + '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs, + '@GSK_EXTRA_LIBS@': '', '@GTK_EXTRA_LIBS@': '', - '@GTK_EXTRA_CFLAGS@': '', 'gtk-4': 'gtk-4.0'} pkg_replace_items.update(base_pc.base_replace_items) - gdk_pc_replace_items.update(pkg_replace_items) gtk_pc_replace_items.update(pkg_replace_items) - # Generate gdk-4.0.pc - replace_multi(base_pc.top_srcdir + '/gdk-4.0.pc.in', - base_pc.srcdir + '/gdk-4.0.pc', - gdk_pc_replace_items) - - # Generate gsk-4.0.pc - replace_multi(base_pc.top_srcdir + '/gsk-4.0.pc.in', - base_pc.srcdir + '/gsk-4.0.pc', - gsk_pc_replace_items) - # Generate gtk+-4.0.pc replace_multi(base_pc.top_srcdir + '/gtk+-4.0.pc.in', base_pc.srcdir + '/gtk+-4.0.pc', diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index 90166a4715..9449f3ce92 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -63,7 +63,7 @@ EXTRA_DIST += \ gtk4-install.vcxproj \ gtk4-install.vcxproj.filters \ gtk4-build-defines.props \ - gtk4-copy-gdk-broadway.props \ + gtk4-copy-gtk-broadway.props \ gtk4-gen-srcs.props \ gtk4-ignore-broadway.props \ gtk4-install.propsin \ diff --git a/build/win32/vs12/gdk-4.vcxproj.filtersin b/build/win32/vs12/gdk-4.vcxproj.filtersin index a6d1e923cf..598c1cd94a 100644 --- a/build/win32/vs12/gdk-4.vcxproj.filtersin +++ b/build/win32/vs12/gdk-4.vcxproj.filtersin @@ -14,9 +14,6 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - Resource Files - #include "gdk-4.vs12.sourcefiles.filters" Source Files diff --git a/build/win32/vs12/gdk-4.vcxprojin b/build/win32/vs12/gdk-4.vcxprojin index c66d7f67c2..8a9775c59e 100644 --- a/build/win32/vs12/gdk-4.vcxprojin +++ b/build/win32/vs12/gdk-4.vcxprojin @@ -41,46 +41,46 @@ - DynamicLibrary + StaticLibrary MultiByte true v120 - DynamicLibrary + StaticLibrary MultiByte v120 - DynamicLibrary + StaticLibrary MultiByte true v120 - DynamicLibrary + StaticLibrary MultiByte v120 - DynamicLibrary + StaticLibrary MultiByte true v120 - DynamicLibrary + StaticLibrary MultiByte v120 - DynamicLibrary + StaticLibrary MultiByte true v120 - DynamicLibrary + StaticLibrary MultiByte v120 @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + @@ -143,15 +143,6 @@ Level3 EditAndContinue - - $(GdkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - $(TargetDir)$(ProjectName).0.lib - MachineX86 - @@ -166,15 +157,6 @@ Level3 EditAndContinue - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX86 - @@ -186,17 +168,6 @@ Level3 ProgramDatabase - - $(GdkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX86 - @@ -208,17 +179,6 @@ Level3 ProgramDatabase - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX86 - @@ -233,15 +193,6 @@ Level3 ProgramDatabase - - $(GdkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX64 - @@ -256,15 +207,6 @@ Level3 ProgramDatabase - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX64 - @@ -276,17 +218,6 @@ Level3 ProgramDatabase - - $(GdkAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX64 - @@ -298,35 +229,11 @@ Level3 ProgramDatabase - - $(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX64 - - - - #include "gdk-4.vs12.sourcefiles" - - - {1df4c475-4472-4ee4-ac2b-3ab5a4c1a453} - false - - - {aba7685a-7cbb-4626-b5e5-6eeea5b489ef} - false - - diff --git a/build/win32/vs12/gsk-4.vcxprojin b/build/win32/vs12/gsk-4.vcxprojin index a4bfca6d9c..7206216427 100755 --- a/build/win32/vs12/gsk-4.vcxprojin +++ b/build/win32/vs12/gsk-4.vcxprojin @@ -25,24 +25,24 @@ - DynamicLibrary + StaticLibrary MultiByte true v120 - DynamicLibrary + StaticLibrary MultiByte v120 - DynamicLibrary + StaticLibrary MultiByte true v120 - DynamicLibrary + StaticLibrary MultiByte v120 @@ -85,15 +85,6 @@ Level3 EditAndContinue - - %(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - $(TargetDir)$(ProjectName).0.lib - MachineX86 - @@ -105,17 +96,6 @@ Level3 ProgramDatabase - - %(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX86 - @@ -130,15 +110,6 @@ Level3 ProgramDatabase - - %(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - MachineX64 - @@ -150,17 +121,6 @@ Level3 ProgramDatabase - - %(AdditionalDependencies) - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(TargetDir)$(ProjectName).0.lib - true - $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb - Windows - true - true - MachineX64 - @@ -195,12 +155,6 @@ #include "gsk-4.vs12.sourcefiles" - - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - diff --git a/build/win32/vs12/gtk+-4.sln b/build/win32/vs12/gtk+-4.sln index 5c81716f29..a23aba35d3 100644 --- a/build/win32/vs12/gtk+-4.sln +++ b/build/win32/vs12/gtk+-4.sln @@ -138,14 +138,14 @@ Global {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.Build.0 = Release|Win32 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.ActiveCfg = Release|x64 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.Build.0 = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.Build.0 = Debug|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.Build.0 = Release|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.ActiveCfg = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.Build.0 = Release|x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.ActiveCfg = Debug|Win32 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.Build.0 = Debug|Win32 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/build/win32/vs12/gtk-4.vcxprojin b/build/win32/vs12/gtk-4.vcxprojin index 3171008dd0..b1a7d1f4f5 100644 --- a/build/win32/vs12/gtk-4.vcxprojin +++ b/build/win32/vs12/gtk-4.vcxprojin @@ -5,20 +5,36 @@ Debug Win32 + + Debug_Broadway + Win32 + Debug x64 + + Debug_Broadway + x64 + Release Win32 true + + Release_Broadway + Win32 + Release x64 true + + Release_Broadway + x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} @@ -26,14 +42,35 @@ Win32Proj + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + DynamicLibrary MultiByte v120 - + DynamicLibrary MultiByte + true v120 @@ -41,36 +78,57 @@ MultiByte v120 - + DynamicLibrary MultiByte + true v120 + + + + + + + + + + + + + + + + - + - + - + - + - + - + true + true false + false true + true false + false @@ -95,6 +153,29 @@ MachineX86 + + + Disabled + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(GtkAdditionalLibs);%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + $(TargetDir)$(ProjectName).0.lib + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + MachineX86 + + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) @@ -117,6 +198,28 @@ MachineX86 + + + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + $(GtkAdditionalLibs);%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + $(TargetDir)$(ProjectName).0.lib + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + MachineX86 + + Disabled @@ -140,6 +243,29 @@ MachineX64 + + + Disabled + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(GtkAdditionalLibs);%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + $(TargetDir)$(ProjectName).0.lib + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + MachineX64 + + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) @@ -162,6 +288,28 @@ MachineX64 + + + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + $(GtkAdditionalLibs);%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + $(TargetDir)$(ProjectName).0.lib + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + MachineX64 + + Generating GTK+ DBus Sources... @@ -176,6 +324,18 @@ Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSourcesX64) ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSources) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSourcesX64) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSources) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSourcesX64) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) Copying GTK+ Win32 Version Resource... @@ -190,6 +350,18 @@ Copying GTK+ Win32 Version Resource... $(CopyGtkWin32RC) ..\..\..\gtk\gtk-win32.rc;%(Outputs) + Copying GTK+ Win32 Version Resource... + $(CopyGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;%(Outputs) + Copying GTK+ Win32 Version Resource... + $(CopyGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;%(Outputs) + Copying GTK+ Win32 Version Resource... + $(CopyGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;%(Outputs) + Copying GTK+ Win32 Version Resource... + $(CopyGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;%(Outputs) Generating GTK+ Win32 Manifest... @@ -204,10 +376,24 @@ Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) ..\..\..\gtk\libgtk4.manifest;%(Outputs) + Generating GTK+ Win32 Manifest... + $(GenerateGtkWin32Manifest) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) + Generating GTK+ Win32 Manifest... + $(GenerateGtkWin32Manifest) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) + Generating GTK+ Win32 Manifest... + $(GenerateGtkWin32Manifest) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) + Generating GTK+ Win32 Manifest... + $(GenerateGtkWin32Manifest) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) - + + ..\..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + #include "gtk-4.vs12.sourcefiles" @@ -231,6 +417,14 @@ + + {1df4c475-4472-4ee4-ac2b-3ab5a4c1a453} + false + + + {aba7685a-7cbb-4626-b5e5-6eeea5b489ef} + false + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} false diff --git a/build/win32/vs12/gtk4-build-defines.props b/build/win32/vs12/gtk4-build-defines.props index 4a11f4a042..f46f7f2621 100644 --- a/build/win32/vs12/gtk4-build-defines.props +++ b/build/win32/vs12/gtk4-build-defines.props @@ -14,7 +14,7 @@ imm32.lib winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs) ws2_32.lib - atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs) + atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GdkAdditionalLibs) <_PropertySheetDisplayName>gtk4builddefinesprops diff --git a/build/win32/vs12/gtk4-builder-tool.vcxproj b/build/win32/vs12/gtk4-builder-tool.vcxproj index 0404e866b5..8365f9bd3e 100644 --- a/build/win32/vs12/gtk4-builder-tool.vcxproj +++ b/build/win32/vs12/gtk4-builder-tool.vcxproj @@ -166,10 +166,6 @@ - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false diff --git a/build/win32/vs12/gtk4-copy-gdk-broadway.props b/build/win32/vs12/gtk4-copy-gtk-broadway.props similarity index 76% rename from build/win32/vs12/gtk4-copy-gdk-broadway.props rename to build/win32/vs12/gtk4-copy-gtk-broadway.props index 4901b2ff9a..941445a58e 100644 --- a/build/win32/vs12/gtk4-copy-gdk-broadway.props +++ b/build/win32/vs12/gtk4-copy-gtk-broadway.props @@ -1,7 +1,7 @@  - + <_PropertySheetDisplayName>gtk4copygdkbroadwayprops @@ -13,36 +13,22 @@ if "$(Configuration)" == "Release" goto END - if "$(Configuration)" == "Debug" goto END - if "$(Configuration)" == "Release_Broadway" goto DoRelease - if "$(Configuration)" == "Debug_Broadway" goto DoDebug - :DoRelease - mkdir .\Release\$(Platform)\bin - -copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\ - -copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Release\$(Platform)\bin\ - +copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\ +copy /b $(Configuration)\$(Platform)\bin\gtk-$(ApiVersion).lib .\Release\$(Platform)\bin\ goto END - :DoDebug - mkdir .\Debug\$(Platform)\bin - -copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Debug\$(Platform)\bin\ - -copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Debug\$(Platform)\bin\ - +copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll .\Debug\$(Platform)\bin\ +copy /b $(Configuration)\$(Platform)\bin\gtk-$(ApiVersion).lib .\Debug\$(Platform)\bin\ goto END - :END diff --git a/build/win32/vs12/gtk4-demo-application.vcxprojin b/build/win32/vs12/gtk4-demo-application.vcxprojin index f5ed864659..d8599a111b 100644 --- a/build/win32/vs12/gtk4-demo-application.vcxprojin +++ b/build/win32/vs12/gtk4-demo-application.vcxprojin @@ -158,10 +158,6 @@ #include "gtk4-demo-application.vs12.sourcefiles" - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false diff --git a/build/win32/vs12/gtk4-demo.vcxprojin b/build/win32/vs12/gtk4-demo.vcxprojin index 3022f4187e..8d536b33a3 100644 --- a/build/win32/vs12/gtk4-demo.vcxprojin +++ b/build/win32/vs12/gtk4-demo.vcxprojin @@ -172,10 +172,6 @@ #include "gtk4-demo.vs12.sourcefiles" - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false diff --git a/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj b/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj index e6587f99e0..bf6a2795fc 100644 --- a/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj +++ b/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj @@ -166,8 +166,8 @@ - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} + + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false diff --git a/build/win32/vs12/gtk4-icon-browser.vcxprojin b/build/win32/vs12/gtk4-icon-browser.vcxprojin index 01015a0cd0..e69a97cb9f 100644 --- a/build/win32/vs12/gtk4-icon-browser.vcxprojin +++ b/build/win32/vs12/gtk4-icon-browser.vcxprojin @@ -162,10 +162,6 @@ #include "gtk4-icon-browser.vs12.sourcefiles" - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false diff --git a/build/win32/vs12/gtk4-ignore-broadway.props b/build/win32/vs12/gtk4-ignore-broadway.props index 5b4c893fa5..ca870b8442 100644 --- a/build/win32/vs12/gtk4-ignore-broadway.props +++ b/build/win32/vs12/gtk4-ignore-broadway.props @@ -1,7 +1,7 @@  - + <_PropertySheetDisplayName>gtk4ignorebroadwayprops @@ -11,7 +11,7 @@ false - $(OutDir)\gdk4-win32.lib;%(AdditionalDependencies) + $(OutDir)\gsk-4.lib;$(OutDir)\gdk-4.lib;$(OutDir)\gdk4-win32.lib;%(AdditionalDependencies) /EXPORT:gdk_win32_display_manager_get_type diff --git a/build/win32/vs12/gtk4-install.propsin b/build/win32/vs12/gtk4-install.propsin index 898b118ff5..9a486c0c3c 100644 --- a/build/win32/vs12/gtk4-install.propsin +++ b/build/win32/vs12/gtk4-install.propsin @@ -9,15 +9,8 @@ mkdir $(CopyDir)\bin mkdir $(CopyDir)\lib\pkgconfig -copy "$(BinDir)\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).dll" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin -copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib - if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN -copy "$(BinDir)\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).dll" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin -copy "$(BinDir)\gsk-$(ApiVersion).lib" $(CopyDir)\lib copy "$(BinDir)\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll" $(CopyDir)\bin copy "$(BinDir)\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib @@ -44,9 +37,6 @@ copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG :DO_BROADWAY_RELEASE -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gsk-$(ApiVersion).lib $(CopyDir)\lib copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib @@ -68,9 +58,6 @@ copy .\Release\$(Platform)\bin\gtk4-builder-tool.pdb $(CopyDir)\bin goto DONE_BIN :DO_BROADWAY_DEBUG -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gsk-$(ApiVersion).lib $(CopyDir)\lib copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib @@ -91,9 +78,8 @@ copy .\Debug\$(Platform)\bin\gtk4-builder-tool.pdb $(CopyDir)\bin :DONE_BIN -copy ..\gdk-4.0.pc $(CopyDir)\lib\pkgconfig -copy ..\gsk-4.0.pc $(CopyDir)\lib\pkgconfig copy "..\gtk+-4.0.pc" $(CopyDir)\lib\pkgconfig +copy "..\gtk+-4.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-4.0.pc" echo off @@ -131,7 +117,7 @@ $(CopyDir)\bin\gtk4-update-icon-cache.exe --ignore-theme-index --force "$(CopyDi $(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer) $(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer) - ..\gdk-4.0.pc;..\gsk-4.0.pc;..\gtk+-4.0.pc + ..\gtk+-4.0.pc <_PropertySheetDisplayName>gtk4installsprops diff --git a/build/win32/vs12/gtk4-install.vcxproj b/build/win32/vs12/gtk4-install.vcxproj index b213d2bbd2..16b6ada9b6 100644 --- a/build/win32/vs12/gtk4-install.vcxproj +++ b/build/win32/vs12/gtk4-install.vcxproj @@ -217,14 +217,6 @@ - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - - - {5ae8f5ce-9103-4951-aede-eb2f3b573be8} - false - {bdae6de2-6bcc-4107-94f0-da12214a02de} false diff --git a/build/win32/vs12/gtk4-query-settings.vcxproj b/build/win32/vs12/gtk4-query-settings.vcxproj index 450063abc2..f8a1f8012c 100644 --- a/build/win32/vs12/gtk4-query-settings.vcxproj +++ b/build/win32/vs12/gtk4-query-settings.vcxproj @@ -166,10 +166,6 @@ - - {5ae8f5ce-9103-4951-aede-ea2f3b573be8} - false - {95a4b53d-2773-4406-a2c1-8fd2840bbad8} false diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am index d5c565414b..cc50fa05ba 100644 --- a/build/win32/vs14/Makefile.am +++ b/build/win32/vs14/Makefile.am @@ -34,7 +34,7 @@ EXTRA_DIST += \ gdk4-broadway.vcxproj \ gdk4-broadway.vcxproj.filters \ gtk4-build-defines.props \ - gtk4-copy-gdk-broadway.props \ + gtk4-copy-gtk-broadway.props \ gtk4-gen-srcs.props \ gtk4-ignore-broadway.props \ gtk4-install.props \ -- 2.30.2